Merge "More API review feedback" into mnc-dev