Merge "Add support for object characteristic type in Service Order"