Updating docs list
Merge branch '7.0' into 6.0