some patches have gone upstream now