Also refactors the commonalities between Standard and Umami into a common base class.
Closes #3393582