Fix providers
Merge branch 'hotfix/1.1.2' into develop