refs #8488 cpp check false positive suppressed
Merge branch 'bugfix/8488_horace_ne_manitd' into develop