Merge changes from orientechnologies.