Merge branch 'bugfix/issues-after-upgrade' into 'develop'

Bugfix/issues after upgrade

See merge request !328
Status Job ID Name Coverage
  Test
passed #17044
test:php

00:00:15

passed #17043
allowed to fail
test:typoscript

00:00:25

 
  Build
passed #17045
build

00:00:33

 
  Layout
passed #17046
layout

00:02:21

 
  Deploy
passed #17047
deploy-develop

00:01:24