Merge branch 'master' into v4.7.x