DEPLOY and DELIVERY commit

[DELIVERED #71383742]
[DELIVERED #71384382]
[DELIVERED #71475042]