CONN-1279: PLEASE DO NOT MERGE.

Changes under the Deploy folder should be saved for CONN-1285