More prep commits for new avatar_url handling (#4157)
#4216
+128
−117
avatar_url handling (#4157)
#4216