Back porting #4905, thanks Jean-Marie!