re #940 - Extended 5904 override