Merge remote-tracking branch 'upstream/master'
merging
File registry feature
Merge remote-tracking branch 'upstream/master'
merge upstream
Merge pull request #256 from azimadnan/master

Card #481Feature for file registry