Merge branch '1918-avatar-background-header-reset-2' into 'develop'