Merge branch 'fix/rich-media-disable-in-config' into 'develop'