Merge branch 'bs/lock'