Remove #locked_contents method
Merge branch 'development'