Merge "Replace generic api_extensions checks"