Merge change 8559 into donut

* changes:
  Empty merge from cupcake: commit 'ff339f0b966c5ca62867689a13ea713e6cb62a15'