Merge from old version