Apply patches from Gwen

Vaibhav Guptarequested to merge
apply-patches-from-gwen into master

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

Merge request reports