Merge branch 'fix/rich-media-fake-statuses' into 'develop'