Merge change 8556 into donut

* changes:
  Empty merge from cupcake: commit '2e7e15f2da527f762f6eb56b974e758d83f12660'