align with 0.5.0-rc.1