Merge pull request #1994 from TheBlueMatt/2023-01-1916-followups