Merge branch 'feature/mcord' of https://github.com/open-cloud/xos