Import patch for all other builds