refs #8752. Kill warning and proper fix.
Merge branch 'feature/8752_fix_cpp_check_issue' into develop