Ticket/master/pdb 954 fallback acceptance

timed out after X. <- should be timed out after X seconds.