Removed the lock record.
Merge branch 'master' into staging