Fixed templates for CMSTT ZpN
Merge remote-tracking branch 'upstream/master' into mle_tests