Merge change 2407 into donut

* changes:
  Manual merge from cupcake_dcm.