Re #10031. Revert changes to Fit
Merge branch 'feature/10031_integrate_FABADA' into develop