Bump to v6.0.0-rc.7
Merge branch 'develop' into v6
Merge branch 'v6' into develop