Merge "Fix 0.8 release content"