refs #10384 Cpp check warnings
Merge branch 'feature/10384_flatBackground' into develop