Lock counter



<!---
@huboard:{"order":115.0,"milestone_order":53.0,"custom_state":""}
-->

Remove this comment if the TODO is now done?