Port of project_service_type to 7.0