Merge branch 'bugfix/subscriptions-replies' into 'develop'