Port the changes from contao/core@be4a7905ea81ce565aa7ddf6e8fbd7132a27132b