Signed-off-by: Xin Sun <ddupgs@gmail.com> (cherry picked from commit 2622fa05a6aa9e0b57d9d15cf243af11927e9a2d)