Merge 0.7 to trunk