worch: sync w/ upstream (bbea36ed9b)