Merge "Replace hidden API with public API"