Added Custom_Properties test to new condition attribute checking code