7 Years Ago
Cherry picking 25708 and 25723