Fix template rendering

Vitalii Fisenko requested to merge vitalii/fix_templ_render into master

Merge request reports