*8824* Submodule changes track ##asmecher/8824-partial-fix##