2053: fixed bug with editing avatars
Merge branch 'i-2053' into staging