Merge new-architecture