Cherry pick two commits into release/1.7 branch

[Aniruddh25]

1. Cherry pick commits f1a0170 and 9025bb3 from main branch to a private branch based out of release/1.7 branch
2. Create a Pull Request from the private branch to merge into release/1.7 branch.