Merge with 0.7