Do not use outdated document instance (again).
Changelog entry.
Merge branch 't/11057' into major