change to Locks class
Merge branch 'ashiq'
mini change