Merge branch 'fix/2047-rich-media-parser' into 'develop'