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