Merge pull request #9463 from saurabh6790/v8_1_patch_fixes

[fix] patch fixes