8.0-r1 release fixes