Added default bookshelf name
Merge branch '5.1.1'