Merge branch 'mob' into topic-self-subscriptions