Apply patches from Gwen

Merged Vaibhav Gupta requested to merge apply-patches-from-gwen into master

Signed-off-by: Gwenhael Goavec-Merou gwenhael.goavec-merou@trabucayre.com

Merge request reports