*8645* Submodule changes