backport

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>