Merge branch 'lucene_memory'