Cherry pick 98a10352 to release/0.13

harshit aggarwal requested to merge cherry-pick-98a1035294a5205b5efa122c545a92a279593f1c into release/0.13 Mar 10, 2022