Merge pull request #10176 from samsonasik/chore-use-single-class-per-…

Merge pull request #10176 from samsonasik/chore-use-single-class-per-… #4123