Merge branch 'refs/heads/t/clang_warning_fixes'