Merge branch 'develop' into feature/better_search