Update changelog and upgrade