Merging from 0.9.0.0
Merging from 0.9.0