ashgti wrote: I see some of this has been reverted. Should I undo the revert and add that to my other PR or should I rebase my changes on HEAD and we can take another stab at updating the stepInTargets request? https://github.com/llvm/llvm-project/pull/142831