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

Make rich media support toggleable

See merge request !748
2 jobs for develop