Merge 6.1.x into master

Merge 6.1.x into master