Merged with latest 0.9.10 branch