2.2 version updates.
Updated.
Merge branch 'develop'
Merge branch 'master' into release-support
Updated to version 2.2.