Merge pull request #2908 from markscott-ms/feat/2884-version-document-store