Merge v4.3 to custom
Merge v4.3 changes to custom template files