Revert "Revert "[cnchi] Rebase on commit f3605e567bf8fc3000fe2fd7f4ba31ddc5e4f6ea""

This reverts commit 9cab3800edb3d1a3a4b50956375923465a38947e.
[cnchi] Rebase on commit 8c672a125d13332bf5b99c3e1b57a0dea412da27