Merge pull request #21923 from surajshetty3416/rename-change-log