Cherry pick stable fixes