Bug #248: Remove Tag on unchecked and lock document
Merge branch 'bug-tag' into dev