Merge pull request #29774 from deepeshgarg007/patch_fixes

fix: Patch fixes