[cnchi] Rebase on commit b22816e6b8dd0a78bdfeeeb3be7b5af2b30a1373