Cherry pick the patch for 1161356