Merge "Replace hidden API with public API" into sc-dev