Sync with most recent cli and war repos