Merge branch 'develop' into feature/redirect-via-search-bar