[BUGFIX] Merge with add file and file reference properties
Merge pull request #554 from hmspl/merge

[BUGFIX] Merge with add file and file reference properties