backport some patches to solve some upstream problems Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> (cherry picked from commit 424848381ce00dbae0a71c5c7a73dcbc57d2dfac)
