Merge branch 'cherry-pick-254b0afa' into 'master'

Merge default content-type fix into master

See merge request !609
3 jobs for 0.9.9 in 3 minutes and 24 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Lint
passed #19564
lint

00:00:56

 
  Build
passed #19565
build

00:01:16

 
  Test
passed #19566
test

00:01:12