Merge pull request #1745 aldendaniels:master into v-1.2
Refactor document delta handling