Merge branch 'develop' into 'remove-avatar-header'