Merge branch 'master' into stable
release version v2.17.0
Merge branch 'stable'