Finish 3744

This finishes the great pull request started by @mickaelandrieu in #3744.
Yeah, but do you think it makes thing more clear without the space?