Merge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev