Merge branch '2022-08-20-enforce-DM_ETH-migration'