Merge 4.7.1 into master