merge to 0.8.4