Merge change 8562 into donut

* changes:
  Empty merge from cupcake: commit '7cecaed3192a6503df0ddf4d81b3b620b7cd9635' into manualmerge