Merge branch 'develop' into 'markus-link-paraprobe-with-north'

# Conflicts:
#   north/app/routes/instances.py
#   tests/app/routes/test_instance.py
3 jobs for markus-link-paraprobe-with-north in 1 minute and 3 seconds (queued for 6 seconds)