Hi all,

The current patch is to fix the issue defined in PR 9514. There's no
regression. Please review this.

Thanks,
Abhijit Halder