7 Years Ago
Cherry picking 25790 + 25799