More 4.0 release changes