Corrected Fit to manage additional workspaces properly. Re #8157
Merge branch 'bugfix/8157_multidomain_fitting_properties' into develop