case 3995 - Patches to provider modules.
Merge branch 'case-3995' into development