(cherry picked from commit f6dffe9816b79a8b1f8de84c2abefb751d3acf4e) Signed-off-by: Jack Yu <jack.yu@suse.com> Co-authored-by: Jack Yu <jack.yu@suse.com>