8.3.x

I did cheat and push these commits to the branch so I could check they build/test successfully in jenkins, before backing them out for this pull request.