Merge branch 'fix-searching-following' into 'develop'