Updated v3.0 branch to v3.0.7-development