cherry picking  + workflow

Signed-off-by: Laurent Kappel <lkappel.ext@orange.com>