This is a placeholder for the work not done in #1679.#1679?action=diff&version=1
We could do this separately or part of #1552.
(In [4451]) fixes #2312, refs #1679 - done
(In [4452]) refs #2312 - fix class hierarchy