Merge in advanced application template