merge 0.8.x (0.8.2)