Update changes for 4.0.6