Merge branch 'jk/maint-mv'