Merge "Rehide the API" into sc-dev