Merge branch 'master' into 'pipeline_fix_paths'

# Conflicts:
#   .gitlab-ci.yml
3 jobs for pipeline_fix_paths in 9 minutes and 34 seconds (queued for 3 seconds)