The first commit contains the base class changes, the second one the test conversions.
Closes #1411074