Make the github PR commits and File changed clean

[LakeShen]

Hi devs,

I found that each PR has a lot of commits and file changed, which could
make it difficult to review. One approach is for the author of the PR to
rebase the latest code in the main branch and force push again. Best,
LakeShen