Pk/master/u36

Merged Philippe Krief requested to merge github/fork/phkrief/pk/master/u36 into master

Merge request reports