Reference: 5502f06729 (cherry picked from commit b89b667ea400521995975ca5744c4d15e83f442f)
5502f06729