Merge branch 'rich_media_parsers_configurable' into 'develop'