Ticket/master/pdb 954 fallback acceptance

Looks good now.