Fix for polymorphic cluster security
Merge pull request #1868 from adaher/hotfix-1.6.2_polymorphicfix

Fix for polymorphic cluster security