Merge branch 'develop' into '269-typo3-to-8-7-24'

# Conflicts:
#   composer.lock
3 jobs for 269-typo3-to-8-7-24 in 4 minutes and 28 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #11337
test:php

00:00:24

 
  Build
passed #11338
build

00:00:31

 
  Layout
passed #11339
layout

00:03:32