Automated merge of into integ-home