Merge branch 'develop' into '4-start-anew'

# Conflicts:
#   .gitlab-ci.yml
1 job for 4-start-anew in 16 seconds (queued for 2 seconds)
latest