Merge changes from original