forward-port all those changelog changes