4.0.2rc2 updates