fix import problem
Merge branch 'v7-stable' into v8-stable
prepare for 8.2.2 release