*8785* Submodule changes track ##beghelli/8785-fix##