Merge branch 'dev' into 'master'

Version 3.17.2

See merge request !32
1 job for dev_embedded_geodb