Re #9390 Fix double from int convertion warning.
Merge branch 'feature/9390_convert_empty_to_tof' into develop