Update features to newset 2.0-rc1 release.
Merge branch 'hotfix-1.8.11' into develop