Merge from the new branch