4.0 release preparation