Port the changes from contao/core@16af46fd1960c89ee96464d0f6e6e993572f0dbe