Updated expected sql
Merge branch 'master' into LB-3.1-testing