Fix for doc id fetch
Fix for doc id fetch
Merge branch 'develop' into setup