Merge branch 'backport-3.23-clang-imsvc' into clang-imsvc