Apply 2028783_2001356 patch for features.