worch: sync with upstream (11e8e96)