Merge pull request #22841 from braders/state-class-tidy