Port contao/core@d1279d5e0ac0b7d1051c8ca0578674a220be8070 from the LTS version