Finalizing release v2.2.1
Merge branch 'release/v2.2.1'