Re #9199. Fixing the builds.
Merge branch 'feature/9199_multidomain_improvements' into develop