all: sync with worch-upstream (4616d53)