Merge change 22659 into eclair

* changes:
  Another round of scary indirect ref changes.