Avatar create fix failed merge, mvg tb