Merge pull request #907 from TheBlueMatt/2021-04-merge-conflicts