Merge 4.6.0 into master