Merge branch 'v4.7.x' into master