merge changes from 0.8.9 to 0.8.10