Merge branch 'master' into '35-build-test-image'

# Conflicts:
#   .gitlab-ci.yml
1 job for 35-build-test-image