Merge with izpack/izpack