Do not use outdated document instance.
Merge branch 't/10212'