Merge pull request #1088 from TheBlueMatt/2021-09-1063-fixups