WIP: tempalte V2

Open Florent Chehab requested to merge v2 into master

Fixes #1 #2

Merge request reports