Merge "Merge commit '91d2cbf4' into manualmerge" into mnc-dev