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