Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11