after merge
add LockCommandBehavior