Merge branch 'master' into 'component-data-model-fixes'

# Conflicts:
#   packages/components/xpub-edit/src/components/main/MainEditor.js
#   packages/components/xpub-submit/package.json
#   packages/components/xpub-teams-manager/package.json
#   packages/ui/package.json