version/iokp merges