Squashed merge from 13-deploy-script-branching