some patches went upstream