Merge change 6935 into donut

* changes:
  DO NOT MERGE: backporting from master: