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