synced patches with upstream