BaseComponent fix
MERGE
Merge
MemoryItem is added.
merge