Alligned version after the merge
Why not to add some locks?
More locks.
Marking special version