merging from 0.90 branch