Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'