Merge branch 'och' into 'master'

Edited subscriptions

See merge request !275
2 jobs for master in 30 minutes and 10 seconds (queued for 6 seconds)
latest
Status Job ID Name Coverage
  Test
passed #3129
black

00:02:16

passed #3128
test

00:30:10

63.0%