Merge branch 'master' into v4.6.x