Writing a test to track the error happening when a form AND predicates are used on a given query
Merge branch 'master' into using_form_plus_query