jhuber6 wrote: /cherry-pick https://github.com/llvm/llvm-project/commit/2d8106cb5a505326d1da0f4461708ed44a0ac761 https://github.com/llvm/llvm-project/commit/718cdeb9c701725412a040b2b7148523a286a256 https://github.com/llvm/llvm-project/pull/125896