I rebased against a very old copy of 8.4.x branch and when I caught up, a lot...

I rebased against a very old copy of 8.4.x branch and when I caught up, a lot had changed and I had to dig through several issues to make sure I was not breaking anything. Here are the changes.