Merge branch 'jk/suppress-clang-warning' into maint