MRG: Synchronize with branch develop

2 jobs from 1818-TestHelper-regression-test-ogr-file in 37 minutes and 45 seconds (queued for 1 second)
merge request
Status Job ID Name Coverage
  Build
passed #734
native-build

00:37:45

passed #735
shark-build

00:35:52