add lockdown capabilities
Merge branch 'lockdown'