Merge branch 'Developer-Branch' into create-team-cloud
build error on matts side

committing what I’m working on to merge with matt’s updated build
Merge branch 'Developer-Branch' into create-team-cloud
fixed more crash
Merge branch 'create-team-cloud' into Developer-Branch