merge branch 0.8.2