v2.2.0

See CHANGELOG for details
Update tests for v2.2.0
Merge branch 'v2.2.0'
Merge branch 'master' into v2.2.0
Merge branch 'v2.2.0'