Merge branch 'develop' into 'fix/hide-follows-counters'