Merge branch 'master' into 'dev-test-hardcoded_paths'

# Conflicts:
#   .gitlab-ci.yml
4 jobs for dev-test-hardcoded_paths
in 31 minutes and 16 seconds, using 0 compute credits, and was queued for 5 seconds