Fixed merge of PicMemoryControl