Merge change 8563 into donut

* changes:
  Empty merge from cupcake: commit '77bab58fd1c21b0e3035dee411b4a938e6a824ce' into manualmerge