Merge master into ExtendedBookDetails