re #7200 minor corrections
Merge branch 'feature/7200_MoveFlatTemplatesToMDEventFactory' into develop