Merge "Resolve feedback from API review"