(cherry picked from commit 8099f561c557e6e01908d4063691dca713d42160)
Co-authored-by: Jays2Kings <jays@outlook.com> (cherry picked from commit 7ba43ae5c283daf2aa63810d03bab04220be4ece)