worch: sync w/ upstream (bbea36ed9b)
Merge branch 'worch-integration-branch' into develop