fix import errors
Merge branch 'v5-stable' into v7-stable
Merge branch 'v7-stable' into v8-stable