Update Avatar Update with latest Master version.