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