Re #6771 Support for non TOF mode