This branch is mainly used to fix avatar bug