Merge pull request #835 from anilgooru/dev-branch

Added support for implementing Add resource.
Fixed issues loading drive content.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: