Merge "Update default DEPLOY_SCENARIO"