Deb/cherry pick provider change fixes