Some changes in docs
Merge branch 'hotfix/2.2.1'