Finish 3744

This finishes the great pull request started by @mickaelandrieu in #3744.
Yea - we have too many or's :). Can you open up a quick PR? I'm on my phone now :)