Fix configuration of first assignment.
Merge branch 'master' into deploy-test