Remove hard link dep.
Merge branch 'develop'