DATACMNS-465 - Polished template.mf.