3.0.0-alpha merge to master