orch: update from upstream 51ceb46