Port the changes from contao/core@2b76ffa1c047e6de925f0242e6eedaffd5178754