Merge "API changes as requested by API council." into sc-dev