align master branch with 0.8.0