Merge "Merge commit 'f5e177b' into merge_try2" into mnc-dev