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