nitfixes
fix formatting problems
Merge branch 'v7-stable' into v8-stable
reestablish missing content lost during import
Merge branch 'v8-stable'