Don't manual update friends when friends is not 0
Merge branch 'MH-587' into dev