Merge branch 'fix/self-follow' into 'develop'