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