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