Merge branch 'bugfix/rich-media-splice-url' into 'develop'