https://github.com/ritter-x2a approved this pull request. Appears to need a rebase, it includes the changes from the previous PR in the stack. Changes look good to me, though. https://github.com/llvm/llvm-project/pull/208893