Merge branch 'release-2.1.0' into develop
docs update
Merge branch 'develop'