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