Merged 3.0 release changes