Fixes broken predicate parser test.
Merge branch 'release/2.1'