Merge pull request #1217 in master
Merge branch 'releases/2.2.6'

2.2.6 release readiness
typo
Merge pull request #1219
Merge pull request #1219 in develop