Merge branch 'release/2.2'
Merge tag '2.2' into develop

Version 2.2