NOBUG updates submodules
BU-95 Fix API for use by subclasses