Patch rescue

Luckily most of my MR's were already against stable-3.1.

But I do have several MR's that were merged to the master branch that need to be reviewd...

I've started cherry-picking to this branch ans started with !820 (merged) I'll try to find some time to go through the rest.