Merge branch 't/clang_analyzer_fixes'