Commit from ubuntu 64