Port the changes from contao/core@134af19ae59fa5541c72d7e5f3a5c31b45d9a8c6