This is a rebase of !950 (closed) which fixes #428 (closed)
I actually like this feature and we should offer it to our users.