BOOK-584 jhon changes
Merge pull request #598 from onepercentclub/feature/BOOK-584b

Feature/book 584b