Merge branch 'feature/space-access'