Merge branch 'target-weight-nonzero' into 'master'