This is a messy hotfix commit history

But at least it's ready... 

... but how to we easily get this back to dev?