nit fixes
Merge branch 'v7-stable' into v8-stable