Merge change 23891

* changes:
  Minor fix.