Re #10545. Fix compiler warnings.
Merge branch 'feature/10545_integrate_any_matrix_workspace' into develop