Merge branch 'master' into 'azure_catalog'

# Conflicts:
#   .gitlab-ci.yml
2 jobs for !17 with azure_catalog in 5 minutes and 11 seconds (queued for 2 seconds)
merge request