Merge branch 'master' into 'net'

# Conflicts:
#   .gitlab-ci.yml
3 jobs for net in 8 seconds (queued for 27 seconds)