Re #9891. Fixing the builds.
Merge branch 'feature/9891_fit_output_md_workspace' into develop