Merge branch 'jc/mv' into next