Merge branch 'mv/maint-merge-fix' into maint