Merging with latest Oriento