Commit from valli.cogo2