worch: sync with upstream (37ac420)