Signed-off-by: Thomas Morin <thomas.morin@orange.com> (cherry picked from commit 626bb58a69)
626bb58a69