Ticket/master/pdb 954 fallback acceptance

The indentation of the above seems to be running to the right :-). I would expect at least all the 'ends' here to have 2 space differences anyway :-).