kimpanel: backport two commit not on 5.10 branch.

Authored by xuetianweng on Jul 22 2017, 10:57 PM.