Merge branch 'master' into 'moveServiceToDataGroups'

# Conflicts:
#   src/cloud/config.ts
3 jobs for !39 with moveServiceToDataGroups in 1 minute and 29 seconds (queued for 1 second)
latest merge request