Merge branch 'fix-compiler-warnings' into hotfix-7.8.06