Merge "Fix MemoryFileTest coretest" into pi-dev