Merge branch 'jk/clang-sanitizer-fixes' into maint