Merge branch '2022-10-21-enforce-some-DM-migrations'