more fert template changes
Merge branch 'dev'