Work for 4.10

Please review and make comments if needed. Commits are self-explanatory.

The idea is that we never force push the master branch, so right now is the last chance to fix things in place instead of having to add new commits later.

After this, I can branch off the experimental branch and start working on 4.11 in parallel already.