Merge branch 'hot-fix' into develop
Fix for inserted wrong path when a TAG file include absolute path of file.
Remove a duplication codes.
Merge branch 'develop' into release-0-1