Ref ed8bf7f0e2e67ca1eb65ffa05518fe29df526642 Updates #9373 (cherry picked from commit 15b37ba15aacafd4335e5b0726044acbf4cdf1f4)
Ref ed8bf7f0e2e67ca1eb65ffa05518fe29df526642 Updates #9373 (cherry picked from commit 15b37ba15aacafd4335e5b0726044acbf4cdf1f4)