Merge ivi into next