* Cherry-pick commit (94aed68968) Co-authored-by: github.com/Shauren <shauren.trinity@gmail.com>
94aed68968