GRP-1015: New UI has poor timeout handling