Merge branch 'provider-proxy', remote branch 'origin'