Merge release-4.7.x to master