TRQ-2924: Core dump fix