worch: sync w/ upstream 2f8f687