Added Provider to ESA
Merge remote-tracking branch 'upstream/sr' into sr2