Merge develop with version2
Merge develop with version2: new file equivalence map