ticket:1 cleanup
Merge branch 't1_user_bio'