Pk/master/update 7

Merged Philippe Krief requested to merge github/fork/phkrief/pk/master/update-7 into master

Merge request reports