merge (fix for bug #6878: Crash with engine=memory)