Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40' * commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40': Manually merge a few fixes from cupcake and cupcake_dcm.
Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40' * commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40': Manually merge a few fixes from cupcake and cupcake_dcm.