Merge change 2522 into donut

* changes:
  This function should be public