Merge pull request #1740 from CircleCI-Public/fix-deploy-marker-flags