Merge branch 'sm/mv-dry-run-update' into maint