Merge branch 'feature/mastodon-api-fixes' into develop