Merge branch 'master' into 'b9329-annotations'

# Conflicts:
#   .gitlab-ci.yml
3 jobs for b9329-annotations in 2 minutes and 42 seconds (queued for 1 second)