CFY-443 temporary fix to provider context
Merge remote-tracking branch 'origin/develop' into develop