merge from origin/0.8.2