Merge branch 'bugfix/rich-media-image-nil' into 'develop'