Merge branch 'hotfix/gavatar_0.1' into develop