Port the changes from contao/core@79b06d4f188e1818d39adb78ff2ab97e6a1f3e48