Finish 3744

This finishes the great pull request started by @mickaelandrieu in #3744.
I'm not sure if I understand what you mean.