Release v2.2
Merge branch 'release/v2.2'