Merge from old parent and OW2 based one