Merge "Remove unnecessary term 'all' from the API name" into main