Fix for the "(x AND y) OR z" bug backported to version 3.6.21.

FossilOrigin-Name: 867347323b0c095159411de36cbd87b09c1b2863
7 files changed