Merge change 8555 into donut

* changes:
  Empty merge from cupcake:  commit '5a3a63f8b450a1902dd26809f18e35ef30befff3'