Template upgrade

Maciej Topylarequested to merge
templateupgrade into master

Merge request reports