Including changes from !366

Signed-off-by: Thomas Citharel <tcit@tcit.fr>