In that case, can we merge this now? There are no test failures apart from timeout errors