Merge pull request #2591 from TheBlueMatt/2023-09-2562-followups