Merge branch 'develop' after fixing issues and changing /e/ search url