(cherry picked from commit 63c40c2ad66e5b32d96cecad0b123db28783ae5c)
Signed-off-by: Honggang LI <honggangli@163.com> (cherry picked from commit db4399852a6440c5b97cd884d1fe94216ecb73c5)