Merge "Add combined_api_defaults module type" into main