Update for 4.0.18