Merge chanegs from old repository