FEATURE: lock device draft implementation.
Merge remote-tracking branch 'origin/master'