Merge tag 'content-type' into next

Patch content-type
1 job for next in 38 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #19801
docker
test

00:00:38