Port the changes from contao/core@2c1d0bc03f40874a7c0a49c377b4972d431325f0