Manual merge from cupcake_dcm.
3 files changed