LPS-33787 PACL - take into account both wrapped and unwrapped cases