- Resolve IllegalReference exception from upstream and apply QueueManager patchup