Merge "Bugfix: Lack of DEPLOY_TYPE"