Merge "Changes as per API council review." into mnc-dev