Merge mule 6854

Ok, I give up. I tried to squash all these tiny commits into one but failed. Please, please, please someone just merge this desaster. Thanks.