DC21-535: Fix whitelist IP conditions