Merge branch 'master' into 'rnou/379-add-compression-on-demand-on-data'

# Conflicts:
#   .gitlab-ci.yml
#   src/client/gkfs_data.cpp
#   src/client/preload.cpp