Merge branch 'master' into v4.8.x