Merge "Address API council feedback" into sc-dev