Merge branch 'devel' into #33_non_subscribers_dont_see_full_briefme
Merge branch '#33_non_subscribers_dont_see_full_briefme' into devel