Merge branch 'hardening/mastodon-rich-media' into 'develop'