Merge branch 'feature/api-cleanup' of github.com:open-cloud/xos into feature/api-cleanup