Port the changes from contao/core@9d6686d3e615e327a37e81d6a55e390f8cd7bbd1