1.7.0-rc4
Merge
2.0.0-dev4