Merge 4.6.1 into master