Re #7360 Fix problem with output when no output dir specified
Merge branch 'feature/7360_fix_hfir_output' into develop