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