Merged xos/master from open-cloud