Re-committing changes after fetching and rebasing.
Addressing issues/concerns in #11611
Merge pull request #12526 from markizano/hotfix.11611

Addressing issues/concerns in #11611