Draft: Pending patches 2

Merged Alexandre Janniaux requested to merge pending-patches-2 into master

Merge request reports