Merge branch 'feature/subscriber-portal' of github.com:open-cloud/xos into feature/subscriber-portal