issue #3626:Modify some files that skipped some modifications because of merge