patches were included upstream