Finalized for 0.8.10 release