Re #7679. Quieting more compiler warnings.
Re #7679. Don't pop warnings for big compile includes.
Merge branch 'feature/7679_compiler_warnings' into develop