Merge pull request #2748 from TheBlueMatt/2023-11-2675-followups