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