Merge main_template changes from custom folder