Merge "Adding Capif provider"