Update to new HEAD

Pull in the changes from the main repo