Co-authored-by: CrepeTF <trungnguyen02@outlookcom> (cherry picked from commit 6f566e67d5e8722fb1f593d18a74756b5e01fc97)