Merge remote-tracking branch 'origin/td-weight-parameters-refactor' into td-weight-parameters-refactor