changed from reentrant lock to count down latch
Merge branch 'remove_reentrant_lock'