Merge "API Review fix." into mnc-ub-dev