Forced clean up of runtime config dictionary which includes a local client
Merge pull request #18461 from s0undt3ch/hotfix/forced-cleanup

Forced clean up of runtime config dictionary which includes a local client