Fix updating of friends
Merge branch 'MH-587' into dev