manual merge of cload app deployer