Merge branch 'bugfix/geohelper-pq1bubble' into 'master'

[pq1bubble] Fix wrong localindex in geohelper

See merge request !3257
8 jobs for master in 48 seconds (queued for 1 second)