Merge jinja plotter to master

Merged Flavio TARSETTI requested to merge dev into master

Merge request reports