Merge "Clarify assert" into mnc-dev