Skip QS with no geometries
Use gn-qs_locality
Merge branch 'master' into production