Populate provides within service provider
Merge branch 'develop'