Merge branch 'master' into 'gluon-cpp'

# Conflicts:
#   .gitlab-ci.yml
12 jobs for gluon-cpp in 13 minutes and 30 seconds (queued for 1 second)