Merge v4.3 template changes into custom templates