Feature/reduce template code size

Merged Simon Morlat requested to merge feature/reduce_template_code_size into master

Merge request reports