Merge change 8561 into donut

* changes:
  Empty merge from cupcake: commit '414f62c0cb7eceeb1cd24bf9e570688a00683f9c' into manualmerge