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