worch: sync w/ upstream (e5879bd)