Merge new-features