Merge "API updates to match API council recommendations." into sc-dev