Merge pull request #1022 from TheBlueMatt/2021-07-to-remote-reorg