Merge "Reduce change for deadlocks in Block::insert()"