Merge branch 'feature/user-status-subscriptions' into 'develop'