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