Merge branch 'feature/8385_compiler_warnings' into develop