4.0.2rc3 updates