update to 2.2.1
Merge branch 'release-2.2.1' into develop