Use not-equal from SQL standard
Merge branch 'query-plans'