Re #8911. Fix compiler warning
Merge branch 'feature/8911_multi_data_fititng' into develop