merged 3.0 release candidate