Merge remote-tracking branch 'ivan/feature/3015_providerconfig_tests' into develop