Signed-off-by: Brice Rising <brice.rising@slalom.com>
(cherry picked from commit 16852f04d92b97de4599b60c2c6a540e950cb97e)