Merge remote-tracking branch 'origin/master' into v4.7.x