Merge branch 'master' into ENG-5486-null-lessthan