[2.7] Add support for keeping boolean values "as is" in query

[2.7] Add support for keeping boolean values "as is" in query #572