Pkj/master/u37

Merged Philippe Krief requested to merge github/fork/phkrief/pkj/master/u37 into master

Merge request reports