Merge 8.0.x, fix CS issues

Merges 8.0.x and fixes CS issues