Merge "Change "ENGINE=HEAP" to "ENGINE=MEMORY""