Merge pull request #1904 from TheBlueMatt/2022-12-1825-followups