Merge branch '2021-09-09-finish-pre-DM_PCI-removal'