Update for 4.2.x