Resolve #3887 Resolve #2038 (cherry picked from commit 731dc89dd1) Co-authored-by: madomado <madonuko@outlook.com>
731dc89dd1