Merge branch 'develop' into 'dev-boileau'

# Conflicts:
#   .gitlab-ci.yml
2 jobs for dev-boileau in 53 seconds (queued for 1 second)