Merge 4.7.2 into master