Merge commit 'a32b5f3252a58416f328399680395aa5fa936640' * commit 'a32b5f3252a58416f328399680395aa5fa936640': Manual merge from cupcake_dcm. Need to be reviewed by enf.
Merge commit 'a32b5f3252a58416f328399680395aa5fa936640' * commit 'a32b5f3252a58416f328399680395aa5fa936640': Manual merge from cupcake_dcm. Need to be reviewed by enf.