Update Master to v3.0.0 drop branch v3.0.0