Longhorn #2530, #2404 Signed-off-by: Shuo Wu <shuo.wu@suse.com> Co-authored-by: David Ko <dko@suse.com>