Update to upstream #4