Merge pull request #97171 from Krishna2323/krishna2323/issue/96971