Merge 6.1.x into master