Port the changes from contao/core@6046665ccb793a3cc204b328719dbfe63eaab644