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