Merge "Merge commit '88c0af88' into mnc-dev..." into mnc-dev