7 Years Ago
Cherry picking 26035 (Schema refresh stripping)