Manually merge from 0.2.0 branch