2.2.0 release
Merge branch 'release' into develop