Merge remote-tracking branch 'origin/master' into tmp/pr3790-merge