Merge "SiteStats row initialization cleanups"