Merge remote-tracking branch 'ozan/replace-provider-source'
Merge remote-tracking branch 'origin/devel'