Document save fixes
Merge remote-tracking branch 'v2/feature/backend' into hotfix/doc-save
Merge pull request #204 from dlu-gs/hotfix/doc-save

Hotfix/doc save