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