Merge pull request #2198 from TheBlueMatt/2023-04-fewer-disables