merged cgiar_provider branch