Merge branch 'hotfix/2.2.6'
Update docs.
Merge branch 'hotfix/2.2.7' into develop