Fix for polymorphic cluster security