sync patches with upstream