use atomic int in lock
Merge remote-tracking branch 'upstream/master' into next