BOOK-673 fixes + BOOK-693