Case 2616 - Added ISBN to entity.
Case 2616 - Code review.
Merge branch 'case-2616' into develop

* case-2616:
  Case 2616 - Code review.
  Case 2616 - Added ISBN to entity.