Merge change 25156

* changes:
  Phantom fun.