Merge patch for nozomi features