Merge from 0.8.0-fixes branch