Port the changes from contao/core@ada5e8d50eb19bae7fa9324262d4b8746817be25