Merge change 2411 into donut

* changes:
  Manual merge from cupcake_dcm. Need to be reviewed by enf.