Automatic merge from submit-queue

fix broken cluster/centos and enhance the style

replace the PR #33818