[ALOY-1148] Update model template code for 1_6_X
Merge pull request #602 from feons/ALOY-1148-b

[ALOY-1148] Update model template code for 1_6_X