Merge dev-18-deploy-tasks