(cherry picked from commit 17792395c3cc59cecf4b298002877ccc2838d682) Co-authored-by: Sijie <devhacker520@hotmail.com>