port to 0.8.0-rc0