Merge 3.2/master into 3.3/develop

Contains a fix by @biakaveron in the query builder to be able to handle both `<> NULL` and `!= NULL` as `IS NOT NULL`