17.Commit: made diag tools nicer