Feature/book 725

+ BOOK-723