Merge "Address API review feedback" into sc-dev