Merge "Updates to API based on API council feedback." into sc-dev