Fixes #6 / [Finishes #80676342] Document locking issues