Merge pull request #98260 from nkdengineer/fix/95882