Release 2.2.0
Merge branch 'release/v2_2_0' into dev