(cherry picked from commit 77596dba67483c8050c3d3ea1c4299360fde6beb) Co-authored-by: Shauren <shauren.trinity@gmail.com>