Prep commits for new avatar_url
handling (#4157)
#4171
Merged
avatar_url
handling (#4157)
#4171