Dev ver 13339-1451 Fixed Bookshelf NPE