Merge "Address the feedbacks from API review"