Backport RAET timeout patch