Pk/master/u30

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

Merge request reports