Signed-off-by: Andy Lee <andy.lee@suse.com> (cherry picked from commit 374b904191a55b3447c15601af7b72ae5fc3396e) Co-authored-by: Andy Lee <andy.lee@suse.com>
Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com> (cherry picked from commit 6a3153a7ecd6b1f8b36ca2a58f62fec8fefddd26)
(cherry picked from commit 629cb0c601a90aa4c80b97c894554bb118b01e63)