Add changes from Onni to the newest version.