Fixes
Merge branch 'release/v2.2.1' into gh-pages