Merge branch 'mass-follow-fixes' into 'develop'