Port the changes from contao/core@3474d99b327e392cc30007da73c9a249b52f61c4