Re #9199. Fixing compiler warnings
Merge branch 'feature/9199_multidomain_improvements' into develop