Re #10462. Compiler warning fix.
Merge branch 'feature/10462_sxdmdnorm_integration' into develop