Tweaking lock targeting
Merge branch 'develop'