Merge branch 'master' into stable
release version v2.18.1
include other recent changes from PRs in changelog.
Merge branch 'stable'