Merge branch 'fix-rich-media-toggle' into 'develop'