(cherry picked from commit e294f4c00fe07670e32858ac1f66b58444bef8bf) Signed-off-by: Andy Lee <andy.lee@suse.com> Co-authored-by: Andy Lee <andy.lee@suse.com>