Merge upstream module.