Table lock deleted rather than destroyed.
Merge branch 'master' into staging