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