Pulling upstream Start World Code into my branch