7 Years Ago
Cherry picking 26449 & 26495