Port the changes from contao/core@1d36f09027952e0c99e3cda335179682207f4895