Merge pull request #2749 from TheBlueMatt/2023-11-2744-followups