Merge branch 'mv/maint-branch-m-symref' into maint