The commit from strgnm

Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>