fix import errors
add info about a common config problem & solution
Merge branch 'v7-stable' into v8-stable
Merge branch 'v8-stable'