Merge pull request #2774 from TheBlueMatt/2023-12-2551-followups