Fruther changes to fix Ticket DT-1268, see previous commit