Document Storage Entity added
Merge origin/master