Merge from 1.0.2 branch