Merge branch 'dev' into 'test'

cleanup some of the notifications. Hopefully we will now see all notifications...

See merge request !62
2 jobs for test in 3 minutes and 29 seconds (queued for 3 seconds)