*8787* Make timeout setting available for tests
*8787* Submodule changes track