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