6.1.x backport

Backporting all the recent fixes to 6.1.x in preparation for 6.1 GA3 release.