Update for merged patches