Final transformed query doesn't contain empty where statement any more
Merge remote-tracking branch 'origin/master'