Re #10008. Fixing a build.
Merge branch 'feature/10008_fitting_changes_for_FABADA' into develop