Refactored local object added solver to user Uuid property of IFileInfo
Merge branch 'rc/2.0.0' into develop