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