Merge branch 'master' into 'slb/al/various-build-fixes'

# Conflicts:
#   src/test/seismic-store-lib/CMakeLists.txt
14 jobs for !91 with slb/al/various-build-fixes in 31 minutes and 6 seconds (queued for 13 seconds)
latest merge request