Fixing a deployment catch-22 issue.
Merge branch 'release/2.1.2'