Merge branch '2021-07-18-finalize-migrations'