Merge change 1912 into donut

* changes:
  Hand merge from cupcake_dcm to donut, part 2.