Checkout collective.contact.core to get our new fixes