Merge branch '2022-10-10-LLVM-related-improvements'