Catch all
Merge pull request #6319 from guardian/fix-kicker-case

Catch all