Merge "Fix CommunalDreamStartableTest test" into main