Ticket/master/pdb 954 fallback acceptance

(sorry, accidentally deleted my old comment) this needs a CR before the [main] block