Fix nested AND expression bug
Merge branch 'develop'