This is to track the comments from PR #12336
This is to track the comments from PR #12336