Try to fix systemtest an warning. Refs #9202
Merge branch 'feature/9202_TopazMDNorm' into develop