CLSN-1699 : improved move to alloc-base code