Created by: bingyanghuang

This is the PR to follow PR#18970 unfinished review changes. @wzzju @Sand3r-