Merge branch 'release/2.2.0' into development
Merge branch 'master' into development
Updated documentation.