Merge branch 'hotfix/rich-media-compile-error' into 'develop'