Merge branch 'fix/rich-media-hashtags-again' into 'develop'