Merge pull request #1047 from TheBlueMatt/2021-08-985-followups