queue timeout may be null
Merge branch '5228-timeouts'