Merge "Addressing the feedback received in the API review." into sc-dev