Re #6771 Support for non TOF mode
Merge branch 'feature/6771_ILL_D33' into develop