Merge branch 'master' into automating-upload

# Conflicts:
#	.gitlab-ci.yml
#	airflow/workflow-svc-v2/segy_to_zgy_ingestion_dag.py
7 jobs for !61 with automating-upload in 8 minutes and 11 seconds (queued for 1 second)
merge request