Merge pull request #3003 from TheBlueMatt/2024-04-2964-followups