Merge branch 'revert/rich-media-censorship' into 'develop'