merge #15419

@ajacoutot, keep a close eye on the indentation! :)