OS-3522 lxbrand panic introduced by OS-3171