Merge branch 'develop' into '19-roadmap-extension-migrate'

# Conflicts:
#   composer.json
2 jobs for 19-roadmap-extension-migrate in 2 minutes and 55 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #2216
build

00:01:26

 
  Layout
passed #2217
layout

00:01:28