branch for 0.6.0-rc.4