Merge "FP2-1511: Use forgotten variables on avatar update" into fp2-dev-v2