Correct the initialization of new documents #1295
Merge remote branch 'gh-chili/master' into merge-unstable-to-master