*8929* Remove unnecessary subclassing
*8929* Submodule update ##asmecher/8929-fix3##