Big Commit for aurora-client