Initial help, upgrade to 2.2
Merge branch 'release/2.2'