Re #8911. Fixing the builds.
Merge branch 'feature/8911_multi_data_fititng' into develop