Attempt to Plug Memory Leak
Put Switch Around Memory Leak

In case of unforeseen side effects.
Merge branch 'master' into kc-mem-leak
Delay Switch Expiry

For a brighter day.
Merge pull request #7450 from guardian/kc-mem-leak

Attempt to Plug Memory Leak on Admin Server