Merge branch - feature/journal-search into development