DEPLOY and DELIVERY commit

[DELIVERED #374497724]
[DELIVERED #73705826]
[DELIVERED #74498126]