Port contao/core@7ad3cd749dbe97b361e0f36279194ce21f55c7b5