Signed-off-by: Mavridis Philippe <mavridisf@gmail.com> (cherry picked from commit 539e15a523)
539e15a523