Merge pull request #2676 from TheBlueMatt/2023-10-various-followups