Merge "BUG-509: fix ModifiedNode locking"