Merge "Merge commit '001701ae' into manualmergetoday" into mnc-dev