Merge in QIP Engine sources