diff --git a/src/App/PropertyFile.cpp b/src/App/PropertyFile.cpp
index 5858d8e1e..70d8622e9 100644
--- a/src/App/PropertyFile.cpp
+++ b/src/App/PropertyFile.cpp
@@ -401,7 +401,7 @@ void PropertyFileIncluded::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyFileIncluded::RestoreDocFile(Base::Reader &reader)
+void PropertyFileIncluded::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::FileInfo fi(_cValue.c_str());
     Base::ofstream to(fi);
diff --git a/src/App/PropertyFile.h b/src/App/PropertyFile.h
index d69f93148..abbcf60ca 100644
--- a/src/App/PropertyFile.h
+++ b/src/App/PropertyFile.h
@@ -91,7 +91,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
@@ -118,4 +118,4 @@ protected:
 
 } // namespace App
 
-#endif // APP_PROPERTFILE_H
+#endif // APP_PROPERTFILE_H
diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp
index a97d12cf5..12db5b7b3 100644
--- a/src/App/PropertyGeo.cpp
+++ b/src/App/PropertyGeo.cpp
@@ -301,7 +301,7 @@ void PropertyVectorList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyVectorList::RestoreDocFile(Base::Reader &reader)
+void PropertyVectorList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h
index 9aa9ac178..9522b590f 100644
--- a/src/App/PropertyGeo.h
+++ b/src/App/PropertyGeo.h
@@ -147,7 +147,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
diff --git a/src/App/PropertyPythonObject.cpp b/src/App/PropertyPythonObject.cpp
index df42a5a73..8b741b48d 100644
--- a/src/App/PropertyPythonObject.cpp
+++ b/src/App/PropertyPythonObject.cpp
@@ -374,7 +374,7 @@ void PropertyPythonObject::SaveDocFile (Base::Writer &writer) const
         writer.Stream().put(*it);
 }
 
-void PropertyPythonObject::RestoreDocFile(Base::Reader &reader)
+void PropertyPythonObject::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
     std::string buffer;
diff --git a/src/App/PropertyPythonObject.h b/src/App/PropertyPythonObject.h
index bd4bec933..869787b22 100644
--- a/src/App/PropertyPythonObject.h
+++ b/src/App/PropertyPythonObject.h
@@ -63,7 +63,7 @@ public:
     /** Use Python's pickle module to restore the object */
     virtual void Restore(Base::XMLReader &reader);
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual unsigned int getMemSize (void) const;
     virtual Property *Copy(void) const;
diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp
index a7ad6812c..eb34fe5d7 100644
--- a/src/App/PropertyStandard.cpp
+++ b/src/App/PropertyStandard.cpp
@@ -1150,14 +1150,20 @@ void PropertyFloatList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyFloatList::RestoreDocFile(Base::Reader &reader)
+void PropertyFloatList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
     str >> uCt;
     std::vector<double> values(uCt);
     for (std::vector<double>::iterator it = values.begin(); it != values.end(); ++it) {
-        str >> *it;
+        if (DocumentSchema > 4) {
+            str >> *it;
+        } else {
+            float val;
+            str >> val;
+            (*it) = val;
+        }
     }
     setValues(values);
 }
@@ -2114,7 +2120,7 @@ void PropertyColorList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyColorList::RestoreDocFile(Base::Reader &reader)
+void PropertyColorList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h
index d7cafc6d4..5922531a9 100644
--- a/src/App/PropertyStandard.h
+++ b/src/App/PropertyStandard.h
@@ -540,7 +540,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
     
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
@@ -833,7 +833,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
     
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
diff --git a/src/Base/Persistence.cpp b/src/Base/Persistence.cpp
index 7054d6acb..f6d91f08b 100644
--- a/src/Base/Persistence.cpp
+++ b/src/Base/Persistence.cpp
@@ -65,6 +65,6 @@ void Persistence::SaveDocFile (Writer &/*writer*/) const
 {
 }
 
-void Persistence::RestoreDocFile(Reader &/*reader*/)
+void Persistence::RestoreDocFile(Reader &/*reader*/, const int DocumentSchema)
 {
 }
diff --git a/src/Base/Persistence.h b/src/Base/Persistence.h
index f05315653..10a017057 100644
--- a/src/Base/Persistence.h
+++ b/src/Base/Persistence.h
@@ -145,7 +145,7 @@ public:
      * \endcode
      * @see Base::Reader,Base::XMLReader
      */
-    virtual void RestoreDocFile(Reader &/*reader*/);
+    virtual void RestoreDocFile(Reader &/*reader*/, const int DocumentSchema);
 };
 
 } //namespace Base
diff --git a/src/Base/Reader.cpp b/src/Base/Reader.cpp
index 496f583da..5131da11b 100644
--- a/src/Base/Reader.cpp
+++ b/src/Base/Reader.cpp
@@ -304,7 +304,7 @@ void Base::XMLReader::readFiles(zipios::ZipInputStream &zipstream) const
         // no file name for the current entry in the zip was registered.
         if (jt != FileList.end()) {
             try {
-                jt->Object->RestoreDocFile(zipstream);
+                jt->Object->RestoreDocFile(zipstream, DocumentSchema);
             }
             catch(...) {
                 // For any exception we just continue with the next file.
diff --git a/src/Base/Reader.h b/src/Base/Reader.h
index f35ff379d..a4b3fc34c 100644
--- a/src/Base/Reader.h
+++ b/src/Base/Reader.h
@@ -165,6 +165,8 @@ public:
 
     /// Schema Version of the document
     int DocumentSchema;
+    /// Version of FreeCAD that wrote this document
+    std::string ProgramVersion;
 
 protected:
     /// read the next element
diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp
index 4d7ce8c9f..b1aedc313 100644
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (c) 2004 Jürgen Riegel <juergen.riegel@web.de>              *
+ *   Copyright (c) 2004 Jrgen Riegel <juergen.riegel@web.de>              *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
@@ -649,7 +649,7 @@ void Document::Restore(Base::XMLReader &reader)
 /**
  * Restores the properties of the view providers.
  */
-void Document::RestoreDocFile(Base::Reader &reader)
+void Document::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     // We must create an XML parser to read from the input stream
     Base::XMLReader xmlReader("GuiDocument.xml", reader);
diff --git a/src/Gui/Document.h b/src/Gui/Document.h
index 85736c6b9..82cc07141 100644
--- a/src/Gui/Document.h
+++ b/src/Gui/Document.h
@@ -119,7 +119,7 @@ public:
     /// This method is used to save large amounts of data to a binary file.
     virtual void SaveDocFile (Base::Writer &writer) const;
     /// This method is used to restore large amounts of data from a binary file.
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     void exportObjects(const std::vector<App::DocumentObject*>&, Base::Writer&);
     void importObjects(const std::vector<App::DocumentObject*>&, Base::Reader&);
     //@}
diff --git a/src/Gui/MergeDocuments.cpp b/src/Gui/MergeDocuments.cpp
index fe1cbbd98..796961941 100644
--- a/src/Gui/MergeDocuments.cpp
+++ b/src/Gui/MergeDocuments.cpp
@@ -160,7 +160,7 @@ void MergeDocuments::SaveDocFile (Base::Writer & w) const
     document->exportObjects(objects, w);
 }
 
-void MergeDocuments::RestoreDocFile(Base::Reader & reader)
+void MergeDocuments::RestoreDocFile(Base::Reader & reader, const int DocumentSchema)
 {
     std::vector<App::DocumentObject*> obj = objects;
     // We must create an XML parser to read from the input stream
diff --git a/src/Gui/MergeDocuments.h b/src/Gui/MergeDocuments.h
index 42bc252e0..af8171619 100644
--- a/src/Gui/MergeDocuments.h
+++ b/src/Gui/MergeDocuments.h
@@ -49,7 +49,7 @@ public:
     void Save (Base::Writer & w) const;
     void Restore(Base::XMLReader &r);
     void SaveDocFile (Base::Writer & w) const;
-    void RestoreDocFile(Base::Reader & r);
+    void RestoreDocFile(Base::Reader & r, const int DocumentSchema);
 
 private:
     zipios::ZipInputStream* stream;
diff --git a/src/Gui/Thumbnail.cpp b/src/Gui/Thumbnail.cpp
index ac0d4490e..7d9a2968b 100644
--- a/src/Gui/Thumbnail.cpp
+++ b/src/Gui/Thumbnail.cpp
@@ -117,7 +117,7 @@ void Thumbnail::SaveDocFile (Base::Writer &writer) const
     writer.Stream().write(ba.constData(), ba.length());
 }
 
-void Thumbnail::RestoreDocFile(Base::Reader &reader)
+void Thumbnail::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
 }
 
diff --git a/src/Gui/Thumbnail.h b/src/Gui/Thumbnail.h
index 2f387a600..c1c4dd024 100644
--- a/src/Gui/Thumbnail.h
+++ b/src/Gui/Thumbnail.h
@@ -52,7 +52,7 @@ public:
     /// This method is used to save large amounts of data to a binary file.
     void SaveDocFile (Base::Writer &writer) const;
     /// This method is used to restore large amounts of data from a binary file.
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     //@}
 
 private:
diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp
index 4bfd7aa02..d5e912eb4 100755
--- a/src/Mod/Fem/App/FemMesh.cpp
+++ b/src/Mod/Fem/App/FemMesh.cpp
@@ -783,7 +783,7 @@ void FemMesh::SaveDocFile (Base::Writer &writer) const
     fi.deleteFile();
 }
 
-void FemMesh::RestoreDocFile(Base::Reader &reader)
+void FemMesh::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     // create a temporary file and copy the content from the zip stream
     Base::FileInfo fi(Base::FileInfo::getTempFileName().c_str());
@@ -890,4 +890,4 @@ struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo(void) const{
 
     return rtrn;
 
-}
\ No newline at end of file
+}
diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h
index dd382005b..fd10f7de5 100755
--- a/src/Mod/Fem/App/FemMesh.h
+++ b/src/Mod/Fem/App/FemMesh.h
@@ -23,7 +23,7 @@
 
 #ifndef FEM_FEMMESH_H
 #define FEM_FEMMESH_H
-
+
 #include <App/ComplexGeoData.h>
 #include <Base/Placement.h>
 
@@ -66,7 +66,7 @@ public:
     virtual void Save (Base::Writer &/*writer*/) const;
     virtual void Restore(Base::XMLReader &/*reader*/);
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     /** @name Subelement management */
     //@{
diff --git a/src/Mod/Fem/App/FemMeshProperty.cpp b/src/Mod/Fem/App/FemMeshProperty.cpp
index e322035a9..134e81bd0 100755
--- a/src/Mod/Fem/App/FemMeshProperty.cpp
+++ b/src/Mod/Fem/App/FemMeshProperty.cpp
@@ -151,9 +151,9 @@ void PropertyFemMesh::SaveDocFile (Base::Writer &writer) const
     _FemMesh->SaveDocFile(writer);
 }
 
-void PropertyFemMesh::RestoreDocFile(Base::Reader &reader)
+void PropertyFemMesh::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
-    _FemMesh->RestoreDocFile(reader);
+    _FemMesh->RestoreDocFile(reader, DocumentSchema);
     hasSetValue();
 }
diff --git a/src/Mod/Fem/App/FemMeshProperty.h b/src/Mod/Fem/App/FemMeshProperty.h
index 7b350ddc4..0a853a9dd 100755
--- a/src/Mod/Fem/App/FemMeshProperty.h
+++ b/src/Mod/Fem/App/FemMeshProperty.h
@@ -77,7 +77,7 @@ public:
     void Save (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     App::Property *Copy(void) const;
     void Paste(const App::Property &from);
diff --git a/src/Mod/Mesh/App/Core/Trim.cpp b/src/Mod/Mesh/App/Core/Trim.cpp
index 57552829f..27a64c156 100644
--- a/src/Mod/Mesh/App/Core/Trim.cpp
+++ b/src/Mod/Mesh/App/Core/Trim.cpp
@@ -157,7 +157,7 @@ bool MeshTrimming::PolygonContainsCompleteFacet(bool bInner, unsigned long ulInd
 bool MeshTrimming::IsPolygonPointInFacet(unsigned long ulIndex, Base::Vector3f& clPoint)
 {
     Base::Vector2D A, B, C, P;
-    double u,v,w, fDetPAC, fDetPBC, fDetPAB, fDetABC;
+    float u,v,w, fDetPAC, fDetPBC, fDetPAB, fDetABC;
     Base::Polygon2D clFacPoly;
     const MeshGeomFacet &rclFacet = myMesh.GetFacet(ulIndex);
   
diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp
index 11fd04fd2..d40352601 100644
--- a/src/Mod/Mesh/App/Mesh.cpp
+++ b/src/Mod/Mesh/App/Mesh.cpp
@@ -297,7 +297,7 @@ void MeshObject::Restore(Base::XMLReader &reader)
     // this is handled by the property class
 }
 
-void MeshObject::RestoreDocFile(Base::Reader &reader)
+void MeshObject::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     load(reader);
 }
@@ -1144,8 +1144,8 @@ void MeshObject::removeSelfIntersections(const std::vector<unsigned long>& indic
     for (it = indices.begin(); it != indices.end(); ) {
         unsigned long id1 = *it; ++it;
         unsigned long id2 = *it; ++it;
-        selfIntersections.push_back(std::make_pair
-            <unsigned long, unsigned long>(id1,id2));
+        selfIntersections.push_back(std::make_pair
+            <unsigned long, unsigned long>(id1,id2));
     }
 
     if (!selfIntersections.empty()) {
@@ -1161,12 +1161,12 @@ void MeshObject::removeFoldsOnSurface()
     MeshCore::MeshEvalFoldsOnSurface s_eval(_kernel);
     MeshCore::MeshEvalFoldOversOnSurface f_eval(_kernel);
 
-    f_eval.Evaluate();
-    std::vector<unsigned long> inds  = f_eval.GetIndices();
-
-    s_eval.Evaluate();
+    f_eval.Evaluate();
+    std::vector<unsigned long> inds  = f_eval.GetIndices();
+
+    s_eval.Evaluate();
     std::vector<unsigned long> inds1 = s_eval.GetIndices();
-
+
     // remove duplicates
     inds.insert(inds.end(), inds1.begin(), inds1.end());
     std::sort(inds.begin(), inds.end());
@@ -1178,8 +1178,8 @@ void MeshObject::removeFoldsOnSurface()
     // do this as additional check after removing folds on closed area
     for (int i=0; i<5; i++) {
         MeshCore::MeshEvalFoldsOnBoundary b_eval(_kernel);
-        if (b_eval.Evaluate())
-            break;
+        if (b_eval.Evaluate())
+            break;
         inds = b_eval.GetIndices();
         if (!inds.empty())
             deleteFacets(inds);
diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h
index 18a883d2c..67b24579d 100644
--- a/src/Mod/Mesh/App/Mesh.h
+++ b/src/Mod/Mesh/App/Mesh.h
@@ -147,7 +147,7 @@ public:
     void Save (Base::Writer &writer) const;
     void SaveDocFile (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     void save(const char* file,MeshCore::MeshIO::Format f=MeshCore::MeshIO::Undefined,
         const MeshCore::Material* mat = 0) const;
     void save(std::ostream&) const;
@@ -181,7 +181,7 @@ public:
     void addMesh(const MeshCore::MeshKernel&);
     void deleteFacets(const std::vector<unsigned long>& removeIndices);
     void deletePoints(const std::vector<unsigned long>& removeIndices);
-    std::vector<std::vector<unsigned long> > getComponents() const;
+    std::vector<std::vector<unsigned long> > getComponents() const;
     unsigned long countComponents() const;
     void removeComponents(unsigned long);
     /**
@@ -372,4 +372,4 @@ private:
 } // namespace Mesh
 
 
-#endif // MESH_MESH_H
+#endif // MESH_MESH_H
diff --git a/src/Mod/Mesh/App/MeshProperties.cpp b/src/Mod/Mesh/App/MeshProperties.cpp
index 552cf54bf..a8c1e1d04 100644
--- a/src/Mod/Mesh/App/MeshProperties.cpp
+++ b/src/Mod/Mesh/App/MeshProperties.cpp
@@ -45,7 +45,7 @@ using namespace Mesh;
 TYPESYSTEM_SOURCE(Mesh::PropertyNormalList, App::PropertyVectorList);
 TYPESYSTEM_SOURCE(Mesh::PropertyCurvatureList , App::PropertyLists);
 TYPESYSTEM_SOURCE(Mesh::PropertyMeshKernel , App::PropertyComplexGeoData);
-
+
 void PropertyNormalList::transform(const Base::Matrix4D &mat)
 {
     // A normal vector is only a direction with unit length, so we only need to rotate it
@@ -221,7 +221,7 @@ void PropertyCurvatureList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader)
+void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
@@ -422,7 +422,7 @@ void PropertyMeshKernel::setPyObject(PyObject *value)
         }
     }
     else if (PyList_Check(value)) {
-        // new instance of MeshObject
+        // new instance of MeshObject
         Py::List triangles(value);
         MeshObject* mesh = MeshObject::createMeshFromList(triangles);
         setValuePtr(mesh);
@@ -478,7 +478,7 @@ void PropertyMeshKernel::SaveDocFile (Base::Writer &writer) const
     _meshObject->save(writer.Stream());
 }
 
-void PropertyMeshKernel::RestoreDocFile(Base::Reader &reader)
+void PropertyMeshKernel::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
     _meshObject->load(reader);
@@ -500,4 +500,4 @@ void PropertyMeshKernel::Paste(const App::Property &from)
     const PropertyMeshKernel& prop = dynamic_cast<const PropertyMeshKernel&>(from);
     *(this->_meshObject) = *(prop._meshObject);
     hasSetValue();
-}
+}
diff --git a/src/Mod/Mesh/App/MeshProperties.h b/src/Mod/Mesh/App/MeshProperties.h
index 04bfb8dee..41457931e 100644
--- a/src/Mod/Mesh/App/MeshProperties.h
+++ b/src/Mod/Mesh/App/MeshProperties.h
@@ -107,7 +107,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     /** @name Python interface */
     //@{
@@ -205,7 +205,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     App::Property *Copy(void) const;
     void Paste(const App::Property &from);
diff --git a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp
index 7fddf8b01..ca8918f4e 100644
--- a/src/Mod/Part/App/PropertyTopoShape.cpp
+++ b/src/Mod/Part/App/PropertyTopoShape.cpp
@@ -261,8 +261,8 @@ void PropertyPartShape::SaveDocFile (Base::Writer &writer) const
     const TopoDS_Shape& myShape = copy.Shape();
     BRepTools::Clean(myShape); // remove triangulation
 
-    // create a temporary file and copy the content to the zip stream
-    // once the tmp. filename is known use always the same because otherwise
+    // create a temporary file and copy the content to the zip stream
+    // once the tmp. filename is known use always the same because otherwise
     // we may run into some problems on the Linux platform
     static Base::FileInfo fi(Base::FileInfo::getTempFileName());
 
@@ -304,7 +304,7 @@ void PropertyPartShape::SaveDocFile (Base::Writer &writer) const
     fi.deleteFile();
 }
 
-void PropertyPartShape::RestoreDocFile(Base::Reader &reader)
+void PropertyPartShape::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     BRep_Builder builder;
 
@@ -397,7 +397,7 @@ void PropertyShapeHistory::SaveDocFile (Base::Writer &writer) const
 {
 }
 
-void PropertyShapeHistory::RestoreDocFile(Base::Reader &reader)
+void PropertyShapeHistory::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
 }
 
@@ -505,7 +505,7 @@ void PropertyFilletEdges::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyFilletEdges::RestoreDocFile(Base::Reader &reader)
+void PropertyFilletEdges::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
diff --git a/src/Mod/Part/App/PropertyTopoShape.h b/src/Mod/Part/App/PropertyTopoShape.h
index a75c85ccd..e17a8c45e 100644
--- a/src/Mod/Part/App/PropertyTopoShape.h
+++ b/src/Mod/Part/App/PropertyTopoShape.h
@@ -87,7 +87,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     App::Property *Copy(void) const;
     void Paste(const App::Property &from);
@@ -138,7 +138,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
@@ -191,7 +191,7 @@ public:
     virtual void Restore(Base::XMLReader &reader);
 
     virtual void SaveDocFile (Base::Writer &writer) const;
-    virtual void RestoreDocFile(Base::Reader &reader);
+    virtual void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
 
     virtual Property *Copy(void) const;
     virtual void Paste(const Property &from);
diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp
index 8f51543e1..082d59611 100644
--- a/src/Mod/Part/App/TopoShape.cpp
+++ b/src/Mod/Part/App/TopoShape.cpp
@@ -939,7 +939,7 @@ void TopoShape::SaveDocFile (Base::Writer &writer) const
 {
 }
 
-void TopoShape::RestoreDocFile(Base::Reader &reader)
+void TopoShape::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
 }
 
diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h
index 9e7ecd9a1..e79d2d06a 100644
--- a/src/Mod/Part/App/TopoShape.h
+++ b/src/Mod/Part/App/TopoShape.h
@@ -111,7 +111,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     unsigned int getMemSize (void) const;
     //@}
 
diff --git a/src/Mod/Points/App/Points.cpp b/src/Mod/Points/App/Points.cpp
index 1156aea12..56090b8a1 100644
--- a/src/Mod/Points/App/Points.cpp
+++ b/src/Mod/Points/App/Points.cpp
@@ -134,7 +134,7 @@ void PointKernel::Restore(Base::XMLReader &reader)
     }
 }
 
-void PointKernel::RestoreDocFile(Base::Reader &reader)
+void PointKernel::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt = 0;
diff --git a/src/Mod/Points/App/Points.h b/src/Mod/Points/App/Points.h
index 2da670a62..7cee43733 100644
--- a/src/Mod/Points/App/Points.h
+++ b/src/Mod/Points/App/Points.h
@@ -90,7 +90,7 @@ public:
     void Save (Base::Writer &writer) const;
     void SaveDocFile (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     void save(const char* file) const;
     void save(std::ostream&) const;
     void load(const char* file);
diff --git a/src/Mod/Points/App/PointsFeature.cpp b/src/Mod/Points/App/PointsFeature.cpp
index d7fb7eb94..39f8bc11f 100644
--- a/src/Mod/Points/App/PointsFeature.cpp
+++ b/src/Mod/Points/App/PointsFeature.cpp
@@ -64,10 +64,10 @@ void Feature::Restore(Base::XMLReader &reader)
     GeoFeature::Restore(reader);
 }
 
-void Feature::RestoreDocFile(Base::Reader &reader)
+void Feature::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     // This gets only invoked if a points file has been added from Restore()
-    Points.RestoreDocFile(reader);
+    Points.RestoreDocFile(reader, DocumentSchema);
 }
 
 void Feature::onChanged(const App::Property* prop)
diff --git a/src/Mod/Points/App/PointsFeature.h b/src/Mod/Points/App/PointsFeature.h
index 67f0cc9cc..b819666fe 100644
--- a/src/Mod/Points/App/PointsFeature.h
+++ b/src/Mod/Points/App/PointsFeature.h
@@ -60,7 +60,7 @@ public:
     /** @name methods overide Feature */
     //@{
     void Restore(Base::XMLReader &reader);
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     /// recalculate the Feature
     virtual App::DocumentObjectExecReturn *execute(void);
     /// returns the type name of the ViewProvider
diff --git a/src/Mod/Points/App/Properties.cpp b/src/Mod/Points/App/Properties.cpp
index aba32ce2c..d4b9d9def 100644
--- a/src/Mod/Points/App/Properties.cpp
+++ b/src/Mod/Points/App/Properties.cpp
@@ -291,7 +291,7 @@ void PropertyCurvatureList::SaveDocFile (Base::Writer &writer) const
     }
 }
 
-void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader)
+void PropertyCurvatureList::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     Base::InputStream str(reader);
     uint32_t uCt=0;
diff --git a/src/Mod/Points/App/Properties.h b/src/Mod/Points/App/Properties.h
index fa4aa46d4..3976bf7f1 100644
--- a/src/Mod/Points/App/Properties.h
+++ b/src/Mod/Points/App/Properties.h
@@ -141,7 +141,7 @@ public:
     void Restore(Base::XMLReader &reader);
 
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     //@}
 
     /** @name Undo/Redo */
diff --git a/src/Mod/Points/App/PropertyPointKernel.cpp b/src/Mod/Points/App/PropertyPointKernel.cpp
index 9134efd8d..c26675362 100644
--- a/src/Mod/Points/App/PropertyPointKernel.cpp
+++ b/src/Mod/Points/App/PropertyPointKernel.cpp
@@ -134,10 +134,10 @@ void PropertyPointKernel::SaveDocFile (Base::Writer &writer) const
     // does nothing
 }
 
-void PropertyPointKernel::RestoreDocFile(Base::Reader &reader)
+void PropertyPointKernel::RestoreDocFile(Base::Reader &reader, const int DocumentSchema)
 {
     aboutToSetValue();
-    _cPoints->RestoreDocFile(reader);
+    _cPoints->RestoreDocFile(reader, DocumentSchema);
     hasSetValue();
 }
 
diff --git a/src/Mod/Points/App/PropertyPointKernel.h b/src/Mod/Points/App/PropertyPointKernel.h
index 6f08944b5..1ac3f5308 100644
--- a/src/Mod/Points/App/PropertyPointKernel.h
+++ b/src/Mod/Points/App/PropertyPointKernel.h
@@ -78,7 +78,7 @@ public:
     void Save (Base::Writer &writer) const;
     void Restore(Base::XMLReader &reader);
     void SaveDocFile (Base::Writer &writer) const;
-    void RestoreDocFile(Base::Reader &reader);
+    void RestoreDocFile(Base::Reader &reader, const int DocumentSchema);
     //@}
 
     /** @name Modification */