Commit from ubuntu 64.2