Backport #164873 and #166067 to `release/21.x`#166409

nga888 wants to merge 2 commits intollvm:release/21.xllvm/llvm-project:release/21.xfrom

nga888:backport-pr164873-pr166067-21.xnga888/llvm-project:backport-pr164873-pr166067-21.xCopy head branch name to clipboard