Tatu asked not to be acknowledged about this enhancement.
Remote tests: Attempt to make timeout test pass on CI