Attempted to port the Indicator condition attribute checking code from origin/master.