This commit restores the attributes when either of the predicates in an AND/OR conjunction is false. Issue: SPR-17210