initial orca commit and build fixes